fix(ObjectStore): Make S3 "connect_timeout" option configurable #53498
+6
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danxuliu
force-pushed
the
fix/noid/make-s3-connect-timeout-option-configurable
branch
from
3c2d75a to
2059a7d
Compare
Member
Author
|
/backport to stable31 |
Member
Author
|
/backport to stable30 |
Member
Author
|
Failing tests are unrelated and it seems that they were introduced in #53457 |
danxuliu
requested review from
ArtificialOwl,
artonge and
provokateurin
and removed request for
a team
provokateurin
approved these changes
Jun 15, 2025
ArtificialOwl
approved these changes
Jun 16, 2025
The hardcoded connection timeout of 5 seconds may not be enough in some cases, so now it is got from the ObjectStore arguments in Nextcloud configuration, falling back to 5 if not set. The connection timeout is set in seconds, but decimal precision can be used for subsecond accuracy (for example, 4.2 for 4200 milliseconds). Signed-off-by: Daniel Calviño Sánchez <[email protected]>
danxuliu
force-pushed
the
fix/noid/make-s3-connect-timeout-option-configurable
branch
from
2059a7d to
d7ae952
Compare
Member
Author
|
Rebased on latest master to (hopefully) get green CI. |
danxuliu
deleted the
fix/noid/make-s3-connect-timeout-option-configurable
branch
This was referenced Jun 17, 2025
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #46317
The hardcoded connection timeout of 5 seconds may not be enough in some cases, so now it is got from the ObjectStore arguments in Nextcloud configuration, falling back to 5 if not set.
The connection timeout is set in seconds, but decimal precision can be used for subsecond accuracy (for example, 4.2 for 4200 milliseconds).
Note that the option is actually
http->connect_timeoutwhen passed to the SDK, but it was kept as a flatconnect_timeoutrather than a nestedhttp->connect_timeoutin the ObjectStore arguments for simplicity.Documentation: nextcloud/documentation#13226